Finished moving code into final(?) resting modules