Feature/upgrade descriptor

I like structs at the top of the file, before methods