Critical Core file updates and organization