Restructured the folder layout