Refactor project organization
Update artifacts