Reworked the folder structure
REALLY redid the folder structure