Removed commented code.
Moved stuff around.
Added/Removed some packages.