Split class file into multiple files, began decoupling