Little refactor

Renamed a lot of files to make things easier - somewhat follows a
convention now.