Moves restriction classes to restrictions package
Fix alias errors