Moved some more files over
removed more files