Added comments, and renamed directories and files