Refactor front end
Merge pull request #4 from KiaFathi/feat/coreStructure

Refactor front end