Markup(*) moved all content within folders for better organisation