Handling barrier rotation and collision once rotated
Some refactoring to get it clean
More refactoring and simplification
Fix copy/paste bug