Convert to maven and cleanup