Changed forlder and maven structure