rearranged files so module works