Modified Directory-Structure to Maven recommended layout, for Unit-Tests