Restructured folders to top level