Improved structs #3 and moved some stuff