Updating dir structure, modularization