Moved the test and source files out of sim