Initial Commit

Importing work from Seb
Move files around and update images