first version towards organizing to structured project