folder structure fixes ?