Moved files into solution structure to add tests