Structures updated and moved to controllers
Small fixes