Refactoring the files to workable