Style tweaks and renamed certain files.