organize files

organize files in logical folders
Merge pull request #1 from shibby-team/organize-filesystem

organize files