Renaming and reorganized code