Reworked dir structure and projects