Restructured the states within dedicated directories for better reading.