Refactored Folder Structure(Testing Pending).