Changed some things around, swapped some files.
Cleany work.