First step porting

Now just som little changes and and a first rename of components