s/_core/core/ shouldn't cause any problems?