Fix relation structure consistency
Group dragBehaviors into its own objects
Code cleanup