Moved code to seperate files per class.