Tidy up source layout to reflect reality
Update README