Moved the file locations around a bit, so the framework functions as a seperate codebase.