re-organized inc files