Moved to maven project