Restructuring and working on integration tests.