Migration to maven
removed old layout
small fixes