Refactoring
Changed directory structure