Started Split of classes, basically a restart of the project but should
take me less time.