Move to src and test directories