Added json state
Moved some file around
Added action queue