sjanota: Project reorganization