added more cleaning
moved subproject files into own directory