Re-ordered files, improved readme