Reorganize entities, adds Gun class outline