Improve readme
Move files to cleanup directory structure