No same file/folder names

Massive bug fix. Should fix a load of problems..