Fixes, added structure files