Split up the classes and utilities into individual sources