Move into src and test folders