Cleanup
Reworked structure setup, moved outside for improved memory handling + option to add new structures
Fixed issue with reusing data structures