Reorganizing folders a bit.. not their final place, but a bit cleaner.