more major file renaming/restructuing