SBT enabled as well. Main app refactored a bit.