move classes into Maven standard locations