Reshuffle to make plugin a first level project