Change folder organization
Add new sources