Files now organized in a more standar way.
Update all the requires accordingly to new file location.