added constants, organized controllers