Controllers and models refactored
indexes added