Continued moving code into their proper object

ñaa