Move Traits to a Traits folder
Work on tests