Clean up

Some cleanup opperation to the file system structure, unecesary files
where deleted.