Make State and Command public classes