Cleaned up and converted to maven