to follow up that last commit, move the core plugin into it's own directory