restructured file a bit to be more obvious