Handle field members

Tidying folder structure / namespaces
Merge branch 'master' of https://github.com/stuart-bennett/Fixtya-v2