Organized handler files for future additions