reordered files, support for multiple tabs

Changes arent finalized yet. This is an intermediate commit