A bit of rearrangment in folder

A bit of rearrangment in folder

Contact: joaquin@isla.io