Move code into src and test directories
fix build for moved directories