Reorganise code
Add tests for import