added some transitions and put stuff in subpackages