Organise directory structure
Update README