More changes and advances
Created the folder Traits to keep all more clean