[REPO] Cleaning up old structure