modularlize dir structure