Refactoring of project. Made it eaiser to generate data. Draft of CLI support.