Version 1.2.1: Updated file structure for Pathogen and misc. code cleanup