Reorganised some of the project inline with common sense
Updated readme and license