Rohini: Refactoring- Changed the directory structure