Tidy up directory structure
Added better README, fixed some comments