Cleared up folder structure