Renamed import package and files therein. Also subclassed Subscribers
for more specific behaviour. Most important changes are in MasterFile
though. TODO is also updated.