Controllers and models folder files rename/clenup