reorganizing for rename, and maven
renamed and updated for maven