Moved files into src and test directories