0.7.0: Clean up and restructure