Refactoring - splitting code to files