Split class into separate files
Commit current progress