Lots of fixes

There were lots of files in the wrong directories. Also, the naming
convention was not followed (some of the filenames did not match the
class names).