folder structure is changed
code refactored