main refactoring - added new files
Merge branch 'development' of https://github.com/jelio/newstracker.git into development