Improve directory structure

The directory structure of the repository has been made more intuitive. The contents of none of the original files has changed.