Move more methods into outside files