Project rename.
Code organisation.