Add states, move definitions to subfolder