Refactory directory structure