Move files to subpackages, fix empty line issue