Initial work around the structing of folders, etc.