Restructured folders to match the repos