restructured to put server files in own folder