General cleanup
Add files