changed maven structure for better dependency management