Update: Improvement of the architecture again. Better use of Maven