Fix POM and make directories cleaner