Organized some controllers
Updated the edit password form & function