Fixed demo link
Improved file structure