restructured src dir for maven build