Added dirs and editted default layout