Added/Fixed package declarations
Semi-fixed layout for sim editor