refactor files to be more simple