Revert "Base structure"

This reverts commit 98fc9c8916594b24995a004d6f2ef7bb6264cc1a.