restructure to add fixtures directory