restructure directories--sanity?