Moved stuff into folders and some messy ininitial code for the non-parametric Part1 stuff