Change project tree to maven convention, fixes in plugin classes