Reorganize files in sections
Fix deploy
More resources to the classpath