controller structur refactored
Merge branch 'feature/core2core' of github.com:srit/intrabytes into feature/core2core