Restructuring src and test directories