updated file structure to support linux and merged branches