Updated some stuff
Updated structure