Updated Structure
Why are you fucking with me git?
Fixed merges and everything should be updated