Reorganisation

Starting to reorganise files to allow further changes.
Fixed solution to include moved project.