Changed file hierachy to have seperate folders for code and tests.