Added comments, renamed files