Renamed some folders to fit changed app structure.
Merge pull request #547 from suralc/advanced-rename

Renamed some folders to fit changed app structure.