Start decoupling and cleaning up files.