Restructured into subprojects for main and test