reorganizing code
reorganizing dir structure