rebuilding project directory because my computer died
merging with old files