Removed Gaps class, Added module