Update to Maven Project. Clean code