Rearranged handlers
Updated config files