re-organized the directory structure