Registration added, directory reorganization