Organized containers code over some files