Remove unused prop, move files correct place