Removal of unnecessary Namespace Aliases

Removal of unnecessary Namespace Aliases. This makes the project able to re-factor (move and rename classes / interfaces etc...)