Readded all files and fixed directory structure