make style changes, reorganize files