Moved around some files for better code organisation.