Changed the Directory Structure