Moved id classes to their own package