interim reorganisation commit.. NOT FUNCTIONAL
untested but complete reorganisation
typo
bug fixes