Folders reorganization and tomcat plugin