Renamed files in according with our file naming convention
Merge pull request #5 from magnusjerre/Rename_files

Renamed files in according with our file naming convention