Changes to the structure of files; Updated comments; Current status=NOT WORKING (just a status push)