Sorted files

The repo is no longer a mess. Sorry, but you'll have to update your
project.