Correct a typo and move theme files to a subdirectory