Fixed changes from code review

All this conflicts I think are due to renaming but since I am not fully sure on what structure/naming of files  you guys agreed on can you please make sure you try merging yourself and if that did not work comment out on what and why you did the renames. We will have to fix your branch manually or you will have to revert this change and apply the changes again. Thanks!