added rainbow-delimiters, refactored packages