Fixed package names and added armor base class