Should finish cleanup of folder structure.