put stuff in alphabetical order in main file & renamed grease