moved some files around to facilitate the server