Feature/move files to demo dir