updated categories
revised cmake rules
fixed pathing