refactor files to be small