Start work on modularizing code