restructured folders to assist packaging.