One more improvements before it will be converted to maven project.