Refactor directory structure
Fixed incorrect data fetching function
Merge branch 'file-structure-refactor' into development