Updated folder structure to better organize code
Merge branch 'release/folder_structure'