Restructered folder structure a bit