prepare files for more testable structure