Restructure directory per gem guidelines