Renaming files for structure
Merge pull request #39 from mr-mr/ccbranch

Renaming files for structure