Added documention + Minor organization-related changes