reorg files + start project 2