Restructured some of the folders