Normalizing file structure. app/ not working yet