Further work on getting the interface back up and fleshing out the Analyser class
Fully restore interface. Change namespace to remove 'src' (not sure if good idea since new files are still created with 'src' in namespace)