Refactor, more files with less code