Little refactor to accomodate user tasks and new file names.

WIP.