Full Assembly working, re-organized assembly layout