Revert "Fix manifest files and folder names (#34)"

This reverts commit f66720f65ae1b77170c98b2c04be34de977d0b90.