restructured the project, so that maven can be used