reverted previous mvn reorganization