Reorganizing folders structures and add utilities and states