FIX: Move services to correct files