Reorganize files, added some usefull class