moving everything over to a more gem friendly structure