Fixed structure

Merged some files together, fixed the whole structure altogether, and
benny pls.