Added the gap classes to a separate file