preparing maven
Few changes and prepare for maven