moved methods into modules, add tweets to categories+friends, refactors