Added all old code

Added old code to different structures and adapted imports