Changing directory structure
Minor Bug Fix