Source assembly now works
Maven updates continue following the refactoring