Cleaned up project structure for running tests.