Moved to match better the structure of a gem