Move files for "better" file structure
test is in testCharacter instead