Moving tax related entities away from TaxationBundle