Reorganize

It was very disorganized :)