updates to permissions, shuffled a few files around