added new folder structure and added properties tag.