rerefactoring tupfiles and simplifying file-dir structure