Rearranged files
Prepared for type scanning for handlers

I want handlers to be found by type scanning.
Don't yet know how this can be done.