fix folder structure to make the build easier