[CR] [000000] use conventional gem file structure