More structure changes
Move callable classes into their own package