Added Controllers and changed structure