Restructure src and tests