Rework functionality back to single-directory