Added attributes and rearranged the files.