Fixed first step of reorganizing backend