reorganized directory structure, merged package files