new folder structure kind of complete