Major restructuring; mind the dust
Updated help and readme