Various formatting changes
Fixing bug where logs aren't shown
Package refactoring