Made classes package local (there's no use in public right now..)