Part two of Mavenize Project

Get rid of old files after move to new location.