fixed bugs
refactor, codeChange, moving files to otherRepo