Moved fixes and splits idcs to parent dir