Revert "Basic structure"

This reverts commit d594efbb5be355584b2d2d8a0ed663dbbe7df5ce.