Huge commit. Large restructure of everything. Tag version 0.6.0-pre.1.