Initialize
Add new files & fix