Improved Directory structure