Moving files from core repo