Code/file refactoring done.