reworking project structure, WIP