Refactoring

Moved some collections into their own files.