applied some changes to folder structure
minor changes