fix folder structure :D #messy