Updated to work with new structure
Updated version info for v0.2.0