Re-structure + added comments, posts, likes, views