moving components to sourcecode