Remove nonatomic and strong where (seemingly) inappropriate, restructure folders a bit.