Reorganise project files to separate class and test files