restructerd the server project to fit the maven layout