Further API movement/organisation
Merge pull request #56 from JamesS237/more_api_organisation

Further API movement/organisation