Clean up tests, reorganise project