prepare for multi module
worked towards multi module Maven project
corrected folder names
moved around some source files, fixed a pom