remove server and restructure repo