restructure
hierarchy and folders architecture improve