Splitting project into two more reasonable packages