Reorganized for sublime text 3