Made ammends for bugs caused by the "classification".. :)

There were multiple problems caused by the DRY try! So, this commit is to repair the code.. Added User class, Made .link to .api_link,