Refactored file structure
some Updates