destination to target refactor 
package rename
clean up
commit