Update# setting up basic directory structure, but still can be imporve