Reorganized source

plus cleaned up the main area to just run one ST