move cms dependant code within cms folder