Modified generated folder structure

Reorganized the folder structure, personal preference plus painful
experience.
Bumped version number