fixed script import and renamed supporting files