Reorganize modules
added user input and feeds classes
commit work in progress (shame on me)
merge changes