reoganize files to modular based