Revert "Got rid of old files"

This reverts commit ea5aa035c7b04a1df0895b3b888c064503fabc7c.
reverted
Merge branch 'master' into new_project