initial structuring with folders
saving some new restructing
structure changes
merging restructuring with latest commit