Put states to own folder