change folder struct
DEAL WITH IT
change folders structrure