Rename files.
Addign demo module and order to code.