Cleanup
Added assembly plugin