Changed to article class, separated into sections