Started reorganizing components