fixed folder structure a bit...