Trying to fix folder organisation.
Trying to fix folder structure