Revert "Basic structure"

This reverts commit ce0810d315ebfda422db12cc5fb58141c14bb91e.