Moved files to better subfolders and wrote some more tests