Refactor base structures
Tiny assertion change and remove a file