Major code refactorization with many breaking chages ("controller as", ...)