Moved to respect proper gem structure