move sources to proper package