Moved Hardware into a seperate assembly