major file restructuring and file cleanup