Moved directories and pom updates
Fix resources for maven build