Added structs and moved folders