Moved Competition classes to correct package