Add all files to repo
Collapse some code