Start moving code to traditional structure