Cleaned up the headers, removed unused structures. Changed some members to strings instead of char arrays. Switch to router templates should now be easier.