added ideas for reworked project structure