restructure again - maven issues