file structure changed and comments added