Updated file structure, slowly moving towards modules.  Refined some server files