Little reorganization in the Additional folder