Split up system and utility classes