formatting and file structure changes