Organize functions into files
Remove macosx custom file