trimming files from test project and moving some things around