revamp directory structure