Start moving code to a Library