Move clases to seperate files.