Change folder structure to standard structure