Namespace consistency. Made folders, moved things appropriately.