Moved the files into the subdir
Clean up names
Update location of fancytext
Need this
Moved tests to the right place