Split methods into other files