fix bugs
Update directory structure to enter modular