Cleaning code and adding resources to classpath