Updated folder structure to a more git like