Reorganizing folders structures and add utilities and states and renaming some files....