reverted to root-level directory structure