One AState class to rule them all!

No more duplicated code between States class, all use the same basis:
AState. Now States class are just wrapper.