Restructure WIP

On the long path to v1.0.0