Changed directory structure to reflect gem pattern.