Fixed chapter organization, as requested by Cesar