Update folder struture to Maven concept