Directories are awesome

Change-Id: Id5cb6e8e8e2f1f704fe6b636483a494911b94ec0