minor changes and re-structuring of directory hierarchy