Rearrange structure, remove unnecessary items from powerline