moved src and test files into subdirectories