Quick notes
Removed redundant modules & added structure helper