Refactering of files and subpackages