Changed file structure and added better url handling using hashtags