Move everything into SBT structure