changed directory structure & and resolved some problems with ways