Re-added files, moved into proj1 folder