Updated files to have two spaces for tab, and to use the new way of giving resources handlers.