restructure, directory browsing todo