Updated guardfile for new dir structure
Saner ordering of files in manifest.json