improved directory and file organization