A massive redesign

Module system
Delete old design