Simplifying directory structure