Added Main unit and removed broken NameMapping from project